projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f336e8 3db6061)
Marge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 3 Jan 2006 18:03:56 +0000 (19:03 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 3 Jan 2006 18:03:56 +0000 (19:03 +0100)
1  2 
tools/libxc/xc_ia64_stubs.c patch | diff1 | diff2 | blob | history
xen/arch/ia64/xen/domain.c patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/xc_ia64_stubs.c
Simple merge
diff --cc xen/arch/ia64/xen/domain.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.